From f213cd2240e5c964f868f16cad64997d2c4b7ff9 Mon Sep 17 00:00:00 2001
From: "iap10@labyrinth.cl.cam.ac.uk" <iap10@labyrinth.cl.cam.ac.uk>
Date: Mon, 23 Aug 2004 15:07:41 +0000
Subject: [PATCH] bitkeeper revision 1.1159.1.96
 (412a083dAhGUZb_6ytHtPU56pIh13g)

cleanup
---
 tools/libxc/xc_linux_restore.c |  4 +---
 tools/libxc/xc_linux_save.c    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
index 3c984b4f19..fe7522e1ed 100644
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@ -11,7 +11,7 @@
 
 #define MAX_BATCH_SIZE 1024
 
-#define DEBUG 1
+#define DEBUG 0
 
 #if DEBUG
 #define DPRINTF(_f, _a...) printf ( _f , ## _a )
@@ -475,7 +475,6 @@ int xc_linux_restore(int xc_handle, XcIOContext *ioctxt)
     {
         if ( pfn_type[i] == (L1TAB|LPINTAB) )
         {
-printf("XXXXXXXXXXXXXXX pin L1\n");
             if ( add_mmu_update(xc_handle, mmu,
                                 (pfn_to_mfn_table[i]<<PAGE_SHIFT) | 
                                 MMU_EXTENDED_COMMAND,
@@ -487,7 +486,6 @@ printf("XXXXXXXXXXXXXXX pin L1\n");
         }
         else if ( pfn_type[i] == (L2TAB|LPINTAB) )
         {
-printf("XXXXXXXXXXXXXXX pin L2\n");
             if ( add_mmu_update(xc_handle, mmu,
                                 (pfn_to_mfn_table[i]<<PAGE_SHIFT) | 
                                 MMU_EXTENDED_COMMAND,
diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c
index 57b4f1ab56..81e5ba5b57 100644
--- a/tools/libxc/xc_linux_save.c
+++ b/tools/libxc/xc_linux_save.c
@@ -12,8 +12,8 @@
 
 #define BATCH_SIZE 1024   /* 1024 pages (4MB) at a time */
 
-#define DEBUG 1
-#define DDEBUG 1
+#define DEBUG  0
+#define DDEBUG 0
 
 #if DEBUG
 #define DPRINTF(_f, _a...) printf ( _f , ## _a )
@@ -413,12 +413,12 @@ int xc_linux_save(int xc_handle, XcIOContext *ioctxt)
 
     /* Setup the mfn_to_pfn table mapping */
     mfn_to_pfn_table_start_mfn = xc_get_m2p_start_mfn( xc_handle );
-printf("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n");
+
     live_mfn_to_pfn_table = 
 	xc_map_foreign_range(xc_handle, DOMID_XEN, 
 			      PAGE_SIZE*1024, PROT_READ, 
 			      mfn_to_pfn_table_start_mfn );
-printf("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n");
+
     /* Canonicalise the pfn-to-mfn table frame-number list. */
     memcpy( pfn_to_mfn_frame_list, live_pfn_to_mfn_frame_list, PAGE_SIZE );
 
@@ -432,8 +432,8 @@ printf("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n");
 
     /* Domain is still running at this point */
 
-    if( live ){
-printf("GO LIVE!!\n");
+    if( live )
+    {
         if ( xc_shadow_control( xc_handle, domid, 
                                 DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
                                 NULL, 0, NULL ) < 0 ) {
@@ -669,7 +669,6 @@ printf("GO LIVE!!\n");
             for ( j = 0; j < batch; j++ ){
                 if ( (pfn_type[j] & LTAB_MASK) == XTAB ){
                     DDPRINTF("type fail: page %i mfn %08lx\n",j,pfn_type[j]);
-printf("type fail: page %i mfn %08lx\n",j,pfn_type[j]);
                     continue;
                 }
   
@@ -902,9 +901,6 @@ printf("type fail: page %i mfn %08lx\n",j,pfn_type[j]);
         goto out;
     }
 
-
-printf("nrpfns according to suspend record is %ld\n", p_srec->nr_pfns );
-
     if (nr_pfns != p_srec->nr_pfns )
     {
 	xcio_error(ioctxt, "Suspend record nr_pfns unexpected (%ld != %ld)",
@@ -940,7 +936,6 @@ printf("nrpfns according to suspend record is %ld\n", p_srec->nr_pfns );
         goto out;
     }
 
-printf("Everything saved OK!\n");
  out:
 
     if ( live_shinfo )          munmap(live_shinfo, PAGE_SIZE);
-- 
2.30.2